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

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

Change-Id: I2d6270b3377e7f4e816585f982b61512d308994b