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: 045f6595 am: db9e4858

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



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