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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a67077a777654a50f3cff385d48a65c9dd71e85