[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-5d70d7e9c9634af1b0b082cbc89e0dad-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 082b55bd -s ours am: a413c4e7 -s ours am: 4bbbdad2 -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 5c344d8a is already in history

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



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