[automerger skipped] Merge "Make SF Hint Session safety margin adjustable with...

[automerger skipped] Merge "Make SF Hint Session safety margin adjustable with a debug prop" into udc-dev am: 7b1cf06a am: f1d1b17e -s ours

am skip reason: skipped by user adyabr

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



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