Merge "Expose sanitizeLocationInfo as SystemApi"
am: cc2956a0bd

Change-Id: I6c53cfbd101ee9e0436741829adc35e52ce2f4bc