Merge changes from topic "revert-2382753-revert-2208281-opengl-matrix-VRTQUTHPDK-IGVJUILFUF" am: 0a84b51762

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2387012

Change-Id: I5d42fd39952e1e29cf66255eea956bc6f7645b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>