Snap for 8589293 from abca8ff86bf9315cd1e3e51cc94f06c191e3a4ff to sc-v2-platform-release am: 49b85e9356

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18436477

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