Merge "Changing per-app default request to TRACK_DEFAULT" am: bc4ca04caa

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

Change-Id: I9632d12c85cc7d0c7d3c80333fdfba7ff024bff2