[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: aaf0cc81 am: 177186bc -s ours am: f5c90fc2 -s ours

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

Change-Id: I06769969347df2bfbf14fb6517e296bcab793fb2