[automerger skipped] Merge "Update the encryption rule of /data/bootanim to...

[automerger skipped] Merge "Update the encryption rule of /data/bootanim to DeleteIfNecessary" into tm-dev am: 7e778c13 -s ours

am skip reason: Merged-In I17bcb901ad533cada4e0aa061196fc94d7b213ec with SHA-1 a1039f9a is already in history

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



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