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

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

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



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