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

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

Change-Id: I6176f4ed207310a5012262c36f14e9f30fdf2e48