[automerger skipped] Merge "Redact key value from log when DEBUG is false" into sc-v2-dev am: 9e02787d -s ours

am skip reason: Merged-In I713fd8c03444167faf35a170b885c38af5482e31 with SHA-1 46b4ba42 is already in history

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

Change-Id: Ie7917d0ccee5e454bde24ed86ee20e48bad931d9