Merge "Add lastActive to the media carousel sort comparator" into tm-dev am:...

Merge "Add lastActive to the media carousel sort comparator" into tm-dev am: c073bcee am: 008a21e0 am: b5c4fe5a am: a404f323

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



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