Merge "A space-efficient 2D matrix - clean up" into sc-dev am: 96937de8 am: 3e7ce6d2 am: 8fff9448

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

Change-Id: I48c51abf8965c520271cef5aeeec196be608da97