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

Merge changes from topic "am-3aaf8bb5fe054546b4807f8442dd0d01" into tm-dev am: 5c2bb6dc am: d53e0bb6

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



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