Merge "Make getCache and putCache in ContentResolver @SystemApi"