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

Change-Id: I75726c747937654cdaea15e299cedf0f72c7c5a5