[automerger skipped] Merge "RESTRICT AUTOMERGE Empty commit in qpr-dev to...

[automerger skipped] Merge "RESTRICT AUTOMERGE Empty commit in qpr-dev to avoid merging the change from udc-dev" into udc-qpr-dev am: e614e41f am: 17d3aff2 -s ours

am skip reason: subject contains skip directive

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



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