Merge "Merge "Make the pending top UID's adj value slightly better than FOREGROUND_APP_ADJ." into rvc-dev am: e58fb44af5 am: bc108bcdb2" into rvc-d1-dev-plus-aosp am: 1dd7f43a92 am: 236d4c7ff1

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

Change-Id: I524bc6a5e8ab3ca6cfd6fc45b361cfbd0d08c14a