Merge "Fix PermissionHistoryTest on R platform." into stage-aosp-sc-ts-dev