Merge "Update to Diagnostic Callback flows for multilayer" am: 829d6494fb am: dd0a2b3ed2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e2d2130c14af20fb422f6c7ebcccb36618dfac
tree: 09b319b5590d1bfb0eaafce3a4de3c763be3637f
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS