Merge changes from topic "revert_gc_fix" into udc-qpr-dev am: 7ad6a3536f

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

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