Merge "Fix a security issue in app widget service." into qt-dev am: 5a292b8bf4 am: f90c770087 am: af809557f8 am: 1dd381ac4a am: ef489b0fec am: e6d0a468f9 am: c6cd57ed1b

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

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