Merge "Using defensive copy for default request remove" am: 1444e3eea1 am: 6cc86364fb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e342da488c7b9271b135a462312d3275abde692