am 9f115938: am 4233ee4b: am b2e91428: Merge "Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515" into lmp-dev

* commit '9f115938a1d81b664daccec6abdb0dd6d0d34aa2':
  Add @SystemApi to LocationManager methods used by GmsCore (with reflection). Bug: 17515515