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

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

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



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