Merge changes from topic "revert-22966073-CJPIHTAOGF" into udc-dev am: 2019101eb9

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

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