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

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



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