Merge "Merge "Updating API to be one way." into udc-dev am: 17d5ffdf am:...

Merge "Merge "Updating API to be one way." into udc-dev am: 17d5ffdf am: c7aa179e am: 02d30ab8" into udc-qpr-dev-plus-aosp am: 2c96125a

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



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