Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 3e432de2a8 am: 88b6a46685 am: 2e5256b1a2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfe6a57de8deb33fc4a63acdf0ea264d5e506883