[automerger skipped] Merge changes from topics "abort-individual-session",...

[automerger skipped] Merge changes from topics "abort-individual-session", "apk-checkpoint", "rebrand-to-revert", "supportsCheckPoint" am: cf2865a1 am: be872d1f -s ours am: cb7a21c4 -s ours am: a28c7c92 -s ours am: b987eb3b -s ours

am skip reason: Change-Id I1619c6f113fc0b07f2c69215683e4964e0e99458 with SHA-1 7e9fdb09 is in history

Change-Id: I0252f37d2eaff2d5bb038d8f5460b52f39a19ea6