[automerger skipped] Merge "Expose...

[automerger skipped] Merge "Expose KEY_DATA_SWITCH_VALIDATION_MIN_INTERVAL_MILLIS_LONG as public API" am: fdbe2583 am: 7e842462 am: 81746188 -s ours am: c2e476c3 -s ours

am skip reason: Merged-In Ibc60b1872c9d1c3db0e4f42776a2616339154370 with SHA-1 98f42108 is already in history

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



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