Merge "Enforce permission check in NearbyService" into tm-dev