Merge "Update strings for location services notification" into rvc-dev am: a653dc5d am: 425bfecf Change-Id: I4baa4e763c70a42b6ff8b7a2b809da682a74c915