Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into...

Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into tm-dev am: f050a9b0 am: 55094342 am: 7fc8e8e7 am: 58f4ff46

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



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