Merge "Merge "Fix NPE which could occur when showing notification guts" into oc-mr1-dev am: cf6a6d244e" into oc-mr1-dev-plus-aosp
am: a464532b92

Change-Id: Ifa801951b0d4f02567eaab0ce43f1611b2757c74