Merge changes from topic "am-3aaf8bb5fe054546b4807f8442dd0d01" into tm-dev am:...

Merge changes from topic "am-3aaf8bb5fe054546b4807f8442dd0d01" into tm-dev am: 5c2bb6dc am: acd9239a am: 93880c25 am: f19f2b31

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



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