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

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

Change-Id: Ib66169ec206a0222d6f7bb638872ee69df1c6c66