Merge "Add lastActive to the media carousel sort comparator" into tm-dev am: c073bcee am: 0f80e485 am: 2447e238 am: 44b30e1f

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



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