Merge "Roll forward ag/3379996 "Make adjustments permission dialog overlay." now that the support lib is ready."