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

Merge "Merge "Merge "Remove "force user set on upgrade" setting" into tm-dev am: bcb47eb6 am: 93b004ca" into tm-qpr-dev am: 8b61491f" into tm-qpr-dev-plus-aosp am: 8477c5ab

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



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