Merge "Merge changes I48a0acc7,I57fbba0a into tm-qpr-dev am: 4a685521 am:...

Merge "Merge changes I48a0acc7,I57fbba0a into tm-qpr-dev am: 4a685521 am: d6cb1eaa" into udc-dev am: 2791471b am: 893f2116

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21872056



Change-Id: Icebf56f17e586730cfdde57059df2516d8a62a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>