[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb" into qt-dev am: 718c21f2 am: b618fee4 -s ours am: fa7e3ae7 -s ours am: a10aa3cc -s ours am: 9ed0b1cc -s ours am: fa015271 -s ours am: 32ddddc4 -s ours

am skip reason: skipped by user yurilin

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



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