* commit 'e48b4f1797b4eeab657c461c4e0e995d0b4e1bc2': Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings Fix for b/4303904: HMJ19 ate my licenses after OTA
* commit 'e48b4f1797b4eeab657c461c4e0e995d0b4e1bc2': Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings Fix for b/4303904: HMJ19 ate my licenses after OTA