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