Restoring the data restriction based on calling package

Bug: 3230263
Change-Id: If035dbc1a061d94b84e750c988a4e086d22e60eb
6 files changed