Merge "Set apex_available property am: 107a8b56b7 am: 89b021ba33 am: 2882dfcbd5" into rvc-qpr-dev-plus-aosp