Merge "Fix NAS feedback UI debug info" into sc-dev am: 96ab6db65f

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

Change-Id: Ia33e48b30ce51d2bc6c611ec6b0dcc0de0bfe208