[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-15296e50d24f4427a098b83b0ab5e764" into udc-dev am: afd28ce1 -s ours

am skip reason: Merged-In Ie0cc529c9154d6e3ac69d2d9e5a760a62bd7fe92 with SHA-1 c0f77b8c is already in history

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



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