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: f6dfecc4

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



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