[automerger skipped] Merge changes from topic "revert_gc_fix" into udc-qpr-dev am: 7ad6a3536f am: ea8484b4d5 -s ours

am skip reason: Merged-In Icc35293ff49e14dc3599fc12d153f70acd29042a with SHA-1 0daae6aacc is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24828717

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

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