Merge "Redact key value from log when DEBUG is false" am: 17a7d79ff4

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

Change-Id: Iea902e93f038cd3a06d63cf6c6cdd149c873df79