[automerger skipped] Merge "Protect /mnt/scratch from stale umount on userdebug" am: b39e6f2887
am: 74a6c69e57
am: 52ea568e2a
-s ours
Change-Id: I9bcbfb155a4f8953134ca3fbffab410ff5658bde
gugelfrei
commit
dc87830ff2