[automerger skipped] Merge "Add restriction grace period for sensitive...

[automerger skipped] Merge "Add restriction grace period for sensitive process-states" into main am: d0298996 am: 5cd22cad -s ours

am skip reason: Merged-In I9a3627e04e7a43953a4053606e6b034925758f7a with SHA-1 a9f76c7b is already in history

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



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