[automerger skipped] Merge "Add a hidden API for...
[automerger skipped] Merge "Add a hidden API for EXTRA_LAST_KNOWN_NETWORK_COUNTRY" am: 954f3d78 am: f62fb887 -s ours
am skip reason: Change-Id Id77b81e18b293d8d8c8e7b3127826fbd577d6117 with SHA-1 8d1791ef is in history
Change-Id: Icb72128d642c1079ac86949470bfdb8e0f8020df