Merge "Fix log spam that got in here somehow." into sc-dev am: 75c9ab57 am:...

Merge "Fix log spam that got in here somehow." into sc-dev am: 75c9ab57 am: 996f0d90 am: ec8c8bfb

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

Change-Id: I4732197c2dd4fce57906afde7760ed5421f2095c