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

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

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



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