Merge "Do not set service-nearby-pre-jarjar installable" into tm-dev