Merge changes I282ed7eb,I4e9ca9ed into tm-dev am: 772f09fe07 am: 2c8a9755ef am: ca16c386a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563479 Change-Id: Icbc0e03f1ce17eb293f7fb45d81876a05287674a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: