Merge "Merge "Add Usage info for LocationManager's APIs" into qt-dev am:...
Merge "Merge "Add Usage info for LocationManager's APIs" into qt-dev am: 11ddc8ea am: 4e5d2a48" into qt-r1-dev-plus-aosp
am: 17ed19b0
Change-Id: I1ddef4773fb46146873df315ae8e22225045bd5c