Merge "[Bugfix] Fix the wrong lastBackgroundTime in UidRecord" am: 3d455315b4 am: 1eb96f8569

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb1a6e643563098ffa29fc64c5d95fb3a30ac65f