[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-cherrypick-cherrypick-cherrypick-cherrypick-jr-long-cn-9vknr7t5l7-hl6ve8qsmb-ujcwz4szq7-f75lck7d11-7gktw0btjz" into sc-qpr1-dev am: 9be96298 -s ours

am skip reason: Merged-In Ib4740ba401667de62fa1a33334c2c1fbee25b760 with SHA-1 b4cc38fe is already in history

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



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