Merge "Update to Diagnostic Callback flows for multilayer" am: 3b75f7a8e9 am: ea848623c9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e2d2130c14af20fb422f6c7ebcccb36618dfac