Merge changes from topic "am-afb14a54e2b948ecbed0920c789042bd" into udc-dev...

Merge changes from topic "am-afb14a54e2b948ecbed0920c789042bd" into udc-dev am: 45ae27ce am: 6bbbfefa

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



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