Merge changes from topic "presubmit-am-87faed4a998c421fb52d7c407d7577eb" into...

Merge changes from topic "presubmit-am-87faed4a998c421fb52d7c407d7577eb" into sc-v2-dev-plus-aosp am: a07253c3 am: ecf57f92

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

Change-Id: I2873dc51d9ee7c3c21161d88dfd173b1181cc82b