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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92f1b8bf5d2675ea88cf8b67cec37a381178e10a