[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: 1cf3e723 -s ours am: 353f0c31 -s ours am: 860c6b92 -s ours

am skip reason: Change-Id I0b06c068cb3957a7db8af5e14598724f72122736 with SHA-1 14c5d835 is in history

Change-Id: If0d6c950b999e887808bdbec807a822fb049f5eb