Merge "Merge "Extract WTF to a separate method for easier search" into udc-dev...

Merge "Merge "Extract WTF to a separate method for easier search" into udc-dev am: 813b664c am: 2c58226f" into udc-d1-dev-plus-aosp am: f8ea485e am: 4e936a8f

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



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