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

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



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