[automerger skipped] Merge "Removed unused mount mode constants" am: 14f35d5f2d am: b68c51d4c4 -s ours

am skip reason: Change-Id I62b66083f2099b429474872b6f9c7cffb9fb906d with SHA-1 6d5527d540 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id54fb43e7cc13a428a9e1d96f053b2104da60fd1