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 am: 6df21915

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



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