Merge "Merge "Block SHELL_UID from overlay fabricate and clear shell overlays...

Merge "Merge "Block SHELL_UID from overlay fabricate and clear shell overlays on boot" into sc-dev am: 987cfe1b am: 073a98e3 am: c5a94538" into sc-v2-dev-plus-aosp am: b20b9311

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

Change-Id: I7305dedc62c7e13a36d69d7233e7a63c1feacd0a