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

Change-Id: Ib95672647d84f74f2fe24b8adac7a5ac30554c0c