Snap for 7097357 from fd15e88faf6290bdfaad9ba0e8e104eb7c1aef9e to rvc-platform-release am: de4a024264

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3c39477442a5aa7cd0055296c2983f8af85b387