Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 am: 79d42a23bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504 Change-Id: I229eb101129ecff6cd6e1597efd65037f8f4921f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: