am 65114403: am 5042f7ea: Unhide ContactsContract#QuickContact and fix sdk build

Merge commit '65114403bf947b04804d846b9fd67e85a57b933b'

* commit '65114403bf947b04804d846b9fd67e85a57b933b':
  Unhide ContactsContract#QuickContact and fix sdk build