Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am:...
Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819 am: b05ab423
Original change: undetermined
Change-Id: I00edcd1c5f37c99b1e6cb8ce1022f4635ac8d78e