Merge "Do not enter hidden API slow path when policy==Disabled"
am: 2b89987412

Change-Id: I6cd59195a3c51dd3efe7ac4b9b305a287723826c