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

Merge "Merge "Add AM#forceStopPackageAsUserEvenWhenStopping" into udc-dev am: a701b0f9" into udc-mainline-prod am: 3d4e38f4

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



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