[automerger skipped] Merge "Add appropriate form-factor variants of update owner confirmation dialog string" into udc-qpr-dev am: dbfeeae0 am: c4c434c3 -s ours

am skip reason: Merged-In Ib3a384f83d8530a61f71cd84dac768fe6f85c35c with SHA-1 fed00087 is already in history

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



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