Merge "[DO NOT MERGE] Compatibilize with git_master" into udc-dev am: 8a3c37e37c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22425466 Change-Id: I30917b88137d1486c8f6563b66c058af9f3aecf6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: