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