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

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



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