Merge "DO NOT MERGE Turn off logcat logging for smart selection logs." into oc-mr1-dev am: bc0dc6dcba
am: 94ab358e5f  -s ours

Change-Id: I5c1b71f21c6d357dd6bafd57c2bbad6f6b814ec7