Merge "Added @UnsupportedAppUsage" into udc-dev am: ca99bf7e4b am: d9b54668b6

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

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