Merge "Change the encryption rule of /data/bootanim to DeleteIfNecessary"