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: I928830e555f7f79c9f5469974a2ad6e947cf9a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>