Merge "Downgrade a WTF to a W" into udc-dev am: 878b61b0 am: 9d30e665 am: a73b99ad

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



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