Merge "No need to show user consent for SingleDevice && isSkipPrompt" into...

Merge "No need to show user consent for SingleDevice && isSkipPrompt" into tm-dev am: 98054aa2 am: a0b50870 am: fd04ec66 am: 55f2b195

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17948532



Change-Id: I5567a6cfba6a67a093d9b700b726847591dde625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>