Merge "Adding project_id ranges for internal app and cache folders." am: 927d9d1c68 am: acadd9bfa0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1934961

Change-Id: I917e7fcc967ca3277caf46f7bb6a80952adc738c