[automerger skipped] Merge changes I197e8b52,I1fde6850 into udc-qpr-dev am: 6552d2f34a am: 6a39657068 -s ours
am skip reason: Merged-In I197e8b523f9f7f99bffe2e3c3608507e754ff60a with SHA-1 a9ad2c2a56 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24039362
Change-Id: I60c384e081e3830c6571539c76bd7b56cb2fa6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: