tree 05315fb63048ad3826bd28e2dccf8a3b7554a5a3
parent db10b5d0385d5e79347220ca9309aa412e5eeabe
author Hugh Chen <hughchen@google.com> 1609981138 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1612833875 +0000

DO NOT MERGE: resolve merge conflicts of c17ec818af7159f4fd678dab3bbad7ef308a7be4 to rvc-qpr-dev

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Iec4d1963e626829b696c2047c5979a684119acf7
(cherry picked from commit dc2b694a5478660ce51814838fb348f9dba71ba2)