Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: de66768a6c am: 21c40a1905 am: 2e5256b1a2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfe6a57de8deb33fc4a63acdf0ea264d5e506883
tree: cede1594330b5508778832f35a1f7f8fbbd96e37
  1. framework/
  2. service/
  3. OWNERS