[automerger skipped] Merge "Move Scoped Storage compat flags definition to ...

[automerger skipped] Merge "Move Scoped Storage compat flags definition to  frameworks/base" into rvc-dev am: 4bd6e9d0 am: f1c49106 am: b8a5d077 am: 0849568d -s ours

am skip reason: Change-Id I0b06c068cb3957a7db8af5e14598724f72122736 with SHA-1 4a989379 is in history

Change-Id: Ie07b8689bcb6f926b53dd8ab76228b1d79bd88b5