[automerger skipped] Merge "Add visible logs about fstrim run for block based checkpoints" am: 419528be57
am: 9389f389f5 -s ours
am skip reason: change_id I0cb8b6a85ae787e1ba2cdd7998a46942ca69760f with SHA1 e802d475bf is in history

Change-Id: I9fcc5843f969cbaeda85d4fb296e7416ddb1cde2