Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: b2c448fa6d am: abf77f1c1c" into rvc-qpr-dev-plus-aosp