Merge changes I0579b3af,If7ecd588 into tm-dev am: f7b504cece am: bdba73e302
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18230085 Change-Id: I25e0f67d03ca2249d6cb2950dbad75baf75abaf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: