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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f4cb9ff8e42373e7ebf71b3d4559b768ebfdbe7
tree: 7362028866816f7e1d44d6a184ea1ae9a42fa828
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS