Merge "Add property invalidated cache to TelephonyManager." into tm-dev