Merge "Fix location split-permission targetSdk"