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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie864851627231669743899b8e0d110635cee6c60