Merge "Include SDK extensions data in bugreports" am: b45aaf2a5d am: 94deb105d4

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

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