Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev