Merge "Address API feedback" into udc-dev am: 16c14463

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



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