Merge "Read files in increasing timestamp order in FileRotator" into main am: fe3deb07dc am: 0e4bad82a4 am: 6e10088cf0 am: 50edee26e3

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

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