Merge "[automerger skipped] Merge "Fix a security issue in app widget...

Merge "[automerger skipped] Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8b am: f90c7700 am: af809557 am: 1dd381ac am: ef489b0f am: 904d80fc am: a809c87f am: 31c6d68a -s ours" into udc-dev am: 39f0f3f0 -s ours

am skip reason: Merged-In Icd2eccb7a90124aca18a3dd463c3f79e3a595c20 with SHA-1 263d7d0b is already in history

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



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