Merge "Revert "Drop max texture cache size from 12x to 5x"" into rvc-dev am: 556fe0b9 am: 1b5d8a8b

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

Change-Id: Id739c9ac3d31671e47af41a915742c529f33e25b