Merge "Extend light-greylist of some TelephonyManager APIs until Q." am: 0bb3c6bb93 am: 572f0ca7e4
am: 1abcf7d70e

Change-Id: I9b738c3efea61704b4d892219cf175466676859e