Merge changes from topic...

Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f2

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



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