Merge "Downgrade a WTF to a W" into udc-dev am: 878b61b063 am: 9d30e66516

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

Change-Id: I70b7b4f011fa7cdb2654c1b99c0796f4d32f2027
Signed-off-by: Automerger Merge Worker <[email protected]>