Merge "Remove some restorcon operations" am: 1f5c2091b7 am: 6c9408128f am: b5c760a2f0 am: fa7884df10

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1906522

Change-Id: I4cb17027c16909b04d08650454ccfa955744dc22