Merge "Dump hidden API policy from dumpsys" into main