Merge "Restrict access to dangerous methods to <= P"
am: ae8548df0b

Change-Id: I3c1271e00e026518e9c4ddafc931a2cac87dcee0