Merge "Revert "Remove comments and code about ro.boot.slot"" am: eb00b1f3aa am: 0ff5f16f7b am: aea4f28852
am: b616ea4068

Change-Id: Ibefaa1ca219900ffe1b5d1287151ed40d3afa4ab