Merge "Fix hidden API usages in LocationAccessPolicy and add API in ActivityManager"