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

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

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