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

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



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