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

Change-Id: Ie40acfeebe656a3551900958ffb84f8897eb44c9