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

Change-Id: I5704de1a286890c03d5b13891152740d08294701