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

Change-Id: I4c0150be02af8974c7ab7abb0bb7a2afa42eb9ce