Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f am: aaca4bc527 am: 6bf43a243c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925 Change-Id: I8f73821abcf07a3c5a945c8fd034c4cb5878b730 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: