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

* commit 'f7003f512f055614c1e297c9c19192a68cbf6794':

Change-Id: Ie93c870ac3c79820e1dc59aad08956fc159bf9c8