am 5f3ecb74: Merge change I5c303ac8 into eclair

Merge commit '5f3ecb74fe829ba4b4931bef69d6713f9e5819a5' into eclair-plus-aosp

* commit '5f3ecb74fe829ba4b4931bef69d6713f9e5819a5':
  Adds black and white line above geolocation permissions prompt. Also increases spacing between checkbox and 'remember' text.