Bug: 196969991 Test: Manual testing with Settings Merged-In: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 Change-Id: Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4 (cherry picked from commit2f193c8157) (cherry picked from commit02e8f56e67) Merged-In:Ia9dc251c853526b2ce66c9f8ff595d496b7f1bc4