Merge "Make sure SELinux labels are correct after move-to operations am: fa7d97fa15 am: 9ecf5010d3" into nyc-mr1-dev-plus-aosp