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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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