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: 069ebc38

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



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