Merge "sepolicy: add support for devices without cache partition am: ad7a0ad2 am: 66d17fbc" into nyc-mr1-dev-plus-aosp