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

Change-Id: Ia57b7637ef10683724ccf7666ba98b660d527e91