Merge "Expose sanitizeLocationInfo as SystemApi" am: cc2956a0bd am: 0df57915af

Change-Id: I067e71e5151b4716b80f7c586e04e0429bf7c80d