tree 4ca1726a05b41e5c0ea1706440d5024d3bf58be9
parent 34d99bc4bc8c44ea65045891e3fb111bd1fc75c1
parent 911cb1fa768614732d08ece70cbeab5158ecec15
author Felipe Leme <felipeal@google.com> 1558566020 -0700
committer android-build-merger <android-build-merger@google.com> 1558566020 -0700

DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit.
am: 911cb1fa76

Change-Id: I15c8da47beb6b4dd64b627aebb0288fcb359c3e5