[automerger skipped] Merge "Ensure TARGET_FLATTEN_APEX == true when ro.apex.updatable is not set" am: 333f7b5f
am: bcbb7f73 -s ours
am skip reason: change_id Id73a594dd9838457e68e2793122592c11a84fc83 with SHA1 18411a42 is in history
Change-Id: Ifc7bb742b93bc4896d002095cb5cd257e31cec3e