[automerger skipped] Add Diagnostics Oid in HAL. am: 2cf69b7084 am: b030643482 am: de3b2fdd4b -s ours

am skip reason: Merged-In Idc44d73f31dc23d4dfaf4f461d8c312338421234 with SHA-1 d5796d6576 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2295841

Change-Id: Icfa7f727999e60c5cd83ad0ed5a584a855a2ef34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>