Merge "Make SF Hint Session safety margin adjustable with a debug prop" into udc-dev am: 7b1cf06a

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



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