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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8988e285826214d8a127e3b6a02498f4ad5d57f8