Merge changes from topic "tc_change_20" into tm-dev am: c50d4b58 am: 86ee8601 am: 7beab799

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



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