Merge "Allow clearing a single change id for tests usage." am: 2805c99594

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a9c218bac4775f5b59c0b8d2c8154f38b0ff4b9