Merge "Block SHELL_UID from overlay fabricate and clear shell overlays on boot" into sc-dev am: 987cfe1bff am: 073a98e367 am: dd8e19b116

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16077739

Change-Id: I687734124ed5ab36d87f1289e6bfea08b12661ba