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 am: 273f5e3f am: 170b5ec4

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



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