Merge "DO NOT MERGE ANYWHERE Add comments and code about ro.boot.slot back"
am: 6b07ee9fb5  -s ours

Change-Id: Ice1295f8e8a6e3aac3bc561fdb2d5d86c56647ea