Merge "Merge "Add AM#forceStopPackageAsUserEvenWhenStopping" into udc-dev am:...

Merge "Merge "Add AM#forceStopPackageAsUserEvenWhenStopping" into udc-dev am: a701b0f9 am: f902a257" into udc-d1-dev-plus-aosp am: a369afc0

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



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