Merge changes from topic "am-99e883e856064d17ba153ec8074ac96d" into udc-qpr-dev am: 4cdfacac

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



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