[automerger skipped] Merge "[DO NOT MERGE] Compatibilize with git_master" into...

[automerger skipped] Merge "[DO NOT MERGE] Compatibilize with git_master" into udc-dev am: 8a3c37e3 am: f5b91b76 -s ours

am skip reason: subject contains skip directive

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



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