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

Merge "Downgrade a WTF to a W" into udc-dev am: 878b61b0 am: ae17a5a3 am: f064ac81 am: e9299613

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



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