[automerger skipped] Merge "Explicitly call restorecon_recursive on...

[automerger skipped] Merge "Explicitly call restorecon_recursive on /metadata/apex" am: 5b2457ed am: b3a10e52 -s ours am: 56efd7b7 -s ours

am skip reason: Change-Id I971ffe35c93bb79d9e71106c24515ec0ee70333a with SHA-1 cf7b6bad is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1348884

Change-Id: I441e74058a030c13c12700c13c31c5d6db9e84e1