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

Change-Id: I63f29138259d8c2f4403611e4939cfb4da51c279