Merge changes from topic "am-99e33d185d7f4240849743d5d7f8a703" into tm-dev am: c8734dcf

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



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