Merge "Include SDK extensions data in bugreports" am: b45aaf2a5d am: 94deb105d4 am: 5133a53569 am: 967ef239be am: 1c48f3643c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2221128

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