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

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

Change-Id: I8cb2361540838c936ffd8996e03086363b480f42