Merge changes from topic "presubmit-am-dbbf3fe15cfd41418536f2a1dc34cd14" into...

Merge changes from topic "presubmit-am-dbbf3fe15cfd41418536f2a1dc34cd14" into tm-qpr-dev-plus-aosp am: 1901131a

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



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