[automerger skipped] Merge "Move Scoped Storage compat flags definition to frameworks/base" into rvc-dev am: 4bd6e9d0 am: 1cf3e723 -s ours
am skip reason: Change-Id I0b06c068cb3957a7db8af5e14598724f72122736 with SHA-1 14c5d835 is in history
Change-Id: I24c5901a5108ef6977ee9535a3eb5386cc62f583