Merge changes from topic "tc_change_21" into tm-dev am: 10ee4528

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



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