Merge "Remove "force user set on upgrade" setting" into tm-dev am: bcb47eb6...

Merge "Remove "force user set on upgrade" setting" into tm-dev am: bcb47eb6 am: 48117b3a am: 20bd562f

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



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