[automerger skipped] Merge "Removed unused mount mode constants" am:...

[automerger skipped] Merge "Removed unused mount mode constants" am: 14f35d5f am: b68c51d4 -s ours am: 9ca26760 -s ours am: 9995d6ca -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b9db6bc7de580294a324f83538f16dcc7d3ae3