Merge "Only restrict scope storage if caller target sdk is above R" into rvc-dev