Merge "Merge "Pipe through attributeId to notification app-op" into rvc-dev am: 7556065b am: 96953f3b" into rvc-d1-dev-plus-aosp