Merge changes from topic "am-08d0df54275d4be69bd77cdf4d6f7551" into udc-dev...

Merge changes from topic "am-08d0df54275d4be69bd77cdf4d6f7551" into udc-dev am: 5026b3d1 am: 35434bd1

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



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