Merge "Add trackingBug to code used by tests." am: 8cce5a4923

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

Change-Id: I07e2bfde9de5e509eb7557aa13da0e92b7241a59