A.
Yes, your interpretation is correct. In subparagraph (h) under PI 910, there is the following explanation. Reference passages are underlined.

(h) Class 2 substances must be further limited to aerosol products containing non-toxic compressed or liquefied gas(es) that are necessary to expel liquids, powders or pastes, packed in inner non-refillable non-metal receptacles not exceeding 120 mL (4 Fl.oz.) capacity each, or in inner non-refillable metal receptacles not exceeding 820 mL (28 Fl.oz.) capacity each (except that flammable aerosols must not exceed 500 mL (17 Fl.oz.) capacity each), subject , in either case, to the following provisions:
In Special Provision A112, there is the following entry.

A112 Consumer commodities May only include substances of Class 2 (non-toxic aerosols only, Class 3 (Packing Group ll and lll), Division 6.1 (Packing Group lllonly), UN3077, UN3082 and UN3175, provided such substances do not have a subsidiary risk. Dangerous goods that are forbidden for transport aboard passenger aircraft must not be transported as consumer commodities.

Therefore, non-toxic flammable aerosols packed in a metal inner receptacle not exceeding 500 mL capacity May be included in ID 8000 Consumer commodity.