Merge changes from topic "tc_change_20" into tm-dev am: f952acfc am: 6ed81499 am: 0e5dae5f

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



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