Merge "Make sure gc_urgent is normal mode, when no need GC" am: 2534f6c8 am:...

Merge "Make sure gc_urgent is normal mode, when no need GC" am: 2534f6c8 am: a513296a am: fcb55837 am: bc34045c am: de8242e7

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



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