Merge "Fix printing duplicate logs to save on battery" into tm-dev am: 617b65e4 am: d09db955

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17411804



Change-Id: I22b44147711c855ad618012cf159f975a1afcd9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>