Merge "Replace PendingIntent#getIntent" am: e0b54f9303 am: c80147e92b am: 6ae3110de3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d5fd57b053418db5e7a2cbd48f23945b350ccc
tree: a1b8de1c000c9e69b9740f67164edf7152ae0b9c
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS