Merge "Set apex_available property am: 107a8b56b7 am: 981d96b395 am: 9b1875e1f9" into rvc-qpr-dev-plus-aosp am: 64139f22b2

Change-Id: I7ee2b2997cdee1f00fa0321e1131c53a3abdbf77