Bug: 132292477
Test: View all related screens.
(cherry picked from commit 1e7c172ad5
)
This should have been submitted with ag/8109287
Bug: 136012133
Test: Clicked through permission screens on cuttlefish
Change-Id: I2663aa365baf78ccc6f0a3d585b09da0dd387970