[automerger skipped] Merge "Adds property indicating presence of power button fingerprint sensor" into sc-dev am: cf61d58f -s ours

am skip reason: skip tag Change-Id Ib433e6f54a57692be23291a55abba5cea8ed0d9d with SHA-1 1f0953bf is already in history

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

Change-Id: I030bed0ad6f96f49cd19b4c949090491b001e8f1