Merge "Add a setting for allowing overlays on Settings app" into rvc-dev am: 8ab31819e0 am: b05ab42331

Original change: undetermined

Change-Id: Ieb42225de9670cef1a4436993112bb4e33ee5cb0