[automerger skipped] Merge "Changing per-app default request to TRACK_DEFAULT" am: bc4ca04caa am: 7bdd8f85d8 am: b146660993 -s ours am: 860c2d6dbb -s ours

am skip reason: skip tag Change-Id I312e55a54f70aa82953a32ab9369d5afc02b75e5 with SHA-1 8d64dfc836 is already in history

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

Change-Id: Ib257ecd676b2a846e56f92224e431e31522c7dcd