[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am:...

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5d am: 5724e154 -s ours am: 95177aab -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954 is in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1400407

Change-Id: If5b9d639b35b8c3017fb3b3dc316fb648951a737