Merge "Add locusId as something taskOrganizers care about" into sc-v2-dev am: 80a34bc07e am: a641ccc607

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

Change-Id: I91b1833471a575c97e72ebb0642a0926566d88dc