Merge changes from topics "add-gc-type-in-art-metrics", "report-uffd-minor-fault" am: bffcfd4c

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



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