Merge 5154e607 ("mm/swap: cache swap migration A/D bits support") into android-mainline

Steps on the way to 6.1-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I323198adbfd3a7009a23ca058a5a592786ee7737