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

Change-Id: I56c684ff661a6789a3609d61e2442fa5bb159e85