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

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

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