Merge "Add aes as A/B OTA partition am: e6bc72730b am: dacf3a7ba1" into oc-mr1-dev-plus-aosp