Merge "Hard code resilient window finger print flag value" into udc-dev am:...

Merge "Hard code resilient window finger print flag value" into udc-dev am: 64d7cea6 am: 1cde9e02 am: b4ac4888

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



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