Merge "Remove SHELL UID permission check from overrideConfig"
am: 17b6a1a987

Change-Id: I8dd665f688db65c9708d34f874c5a28912dcd426