Merge changes I2769bc3f,I20171f31 into tm-dev am: 4d72ee1293 am: 9339046dae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18247037 Change-Id: I938895c524b8f36fd0c2449de6939a6d7f8005df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: