Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56

Change-Id: Idaabb296a7c600dcf8d4798a3687e43788e9f00d