Merge "Conditionalize LocAccessToEvent on Android target build." am: a128781f9e
am: 8c52b12b46

Change-Id: I6b668cce57230b483cf34b76d55389a7220fe2b7