Revert "Remove Q matrices"

Revert submission 2808255-deprecate_android_q

Reason for revert: Broke a device build that is targeting Q b/308482858

Reverted changes: /q/submissionid:2808255-deprecate_android_q

Change-Id: Icc5250b219b8500bbd98eba0d20c637c76b734e6
4 files changed