Merge changes from topic "am-4c5f537596ec4c2880fcaaf62e125f68" into tm-dev am: 629b6946

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

Change-Id: I158a42ab2c563fa65b4e3a8965db43b513aa3f29