Merge changes I88baa0eb,Ic63ada05,I5e7eb52c,Ifd28e920 into tm-qpr-dev am: 89a037dbed am: b01341d059 am: 46c164be1e am: c392797f1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21679059 Change-Id: I6bb2fe6365e1ba79ca50b9657b7126b2242d88a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: