[automerger skipped] Merge changes from topics "add-gc-type-in-art-metrics",...

[automerger skipped] Merge changes from topics "add-gc-type-in-art-metrics", "report-uffd-minor-fault" am: bffcfd4c am: 50b1e71d -s ours am: 54f9bc2f -s ours

am skip reason: Merged-In I675a90adbc514c92d0ca56936917d5063d7a0215 with SHA-1 74a3cb14 is already in history

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



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