Merge "Remove hidden INVALID_RESOURCE_ID in unused param" am: 31558edb8e am: 3fef231b42

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24c665e10814ddf46005fa84ea12cbd4e4e22369