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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58fea937ee7f785efe3ff36d4bc9cf506c87a3ff
tree: 6d0d0e65183070ec2664263a916fa9edef1a635d
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS