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

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

Change-Id: I96d0ee8dcaf69a21b75fbfba85402d11c86c57f0