Merge "Add j.a.p.Generated to ART's Public API surface" into android12-dev