[automerger skipped] Merge "Apply FLAG_IMMUTABLE to the PendingIntent in...

[automerger skipped] Merge "Apply FLAG_IMMUTABLE to the PendingIntent in NetworkStatService.java" am: 2c0bf15a am: fd32ff54 am: 5e2b1cec am: 4453859c -s ours

am skip reason: Change-Id I35ccfc0f69fd98b5803da74d9eb12902b351acc7 with SHA-1 eb04cb7b is in history

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

Change-Id: Idadfa833e3b030df4a592207ddb7a89a028ecd4d