[automerger skipped] Try locking after mounting metadata am: fc1e1aee am:...

[automerger skipped] Try locking after mounting metadata am: fc1e1aee am: dee7426a -s ours am: 02f2e8cd -s ours am: e96842e5 -s ours

am skip reason: Change-Id I412d62b7005c81a7126106edc471622e6a7ef813 with SHA-1 44033e75 is in history

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

Change-Id: Icb1b99078eb90ce9351e6b2d9434366991d7ea0a