Merge changes from topic "am-021bbbc028b04001bdc97bef8de99666" into udc-qpr-dev-plus-aosp am: 93dfdff0

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



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