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