Merge "Revert "Drop max texture cache size from 12x to 5x"" into rvc-dev am: 556fe0b9e5 am: 6bf4b6b216 am: aeae81a937 am: 3844f2a385

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

Change-Id: I7f9db598d3051993c1fc58b35ffd2d84527842ad