Merge "Update BUFFER_CACHE_MAX_SIZE" into udc-qpr-dev am: 1a6e0bcb0c am: f4eb1d0fcc

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

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