Merge "Set explicit target when constructing PendingIntent" into rvc-dev am: dca99f9618 am: 88c8b62b8c am: 3048ea3ef5

Change-Id: I8d1deb1dee39c8d78f8a784be264486207b73920