Merge "Move Scoped Storage compat flags definition to  frameworks/base"