Merge "RESTRICT AUTOMERGE Empty commit in qpr-dev to avoid merging the change...

Merge "RESTRICT AUTOMERGE Empty commit in qpr-dev to avoid merging the change from udc-dev" into udc-qpr-dev am: e614e41f

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



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