[automerger skipped] Merge "Add trackingBug to code used by tests." am:...

[automerger skipped] Merge "Add trackingBug to code used by tests." am: 8cce5a49 am: f9bda93c am: 204bb0fd am: c05066bb -s ours

am skip reason: Change-Id Ic9df340620bf6c4e2cdd0dff077548f5807fa8e3 with SHA-1 3af3fc63 is in history

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

Change-Id: Ic7a5f908b707ba59de0bf8f086bf7d267e48086b