Merge changes from topic "tc_change_21" into tm-dev am: ed80739e32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18103870 Change-Id: Ib27c0a3f380647df01b608007f42772cf9ca6c24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: