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

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



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