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

Change-Id: I0bf6df4950c31c8ba6cda859ff652bb7271a52a0