[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-c85b8786af084e679d5b97124802a87e" into tm-qpr-dev-plus-aosp am: ed00447d -s ours am: ba85aff9 -s ours

am skip reason: Merged-In I687f35f4989f9e23276451c9b3a3ce8578e64280 with SHA-1 fc8087ce is already in history

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



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