Merge changes from topic "am-3d034d7a464a4106aaa9c7151c240144" into rvc-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE apex: install flattened from apex_set" into rvc-dev am: f221e594 am: 47f4e178
DO NOT MERGE apex: install flattened from apex_set am: 29637162 am: f45e20d6