Merge changes from topic "am-b2f392edf061412196627ca584b13a2c" into tm-dev am: 08a34d78

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



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