Merge "Add appropriate form-factor variants of update owner confirmation...

Merge "Add appropriate form-factor variants of update owner confirmation dialog string" into udc-qpr-dev am: dbfeeae0

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



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