Merge "No need to show user consent for SingleDevice && isSkipPrompt" into tm-dev am: 98054aa2e3 am: a0b5087018
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17948532 Change-Id: I2366ad7fa56d72d39693010ae965f22b9bd35ba7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: