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

Change-Id: I21e6630799f6bbbae97d9480003fa4d283e96b71