Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56" into rvc-d1-dev-plus-aosp am: f2922c3057

Change-Id: I1118269081a7d8d0de0dce0d53644ac4a96b78df