Merge "Changing per-app default request to TRACK_DEFAULT" am: 4a57fe5c2b am: 9aba2cb910

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

Change-Id: I16f4bc417880aeef53a17cb1830666b5fefe5889