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: 93b004ca am: c4d0b533

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



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