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