Revert "Entitlement APP overlay"

This reverts commit c1109e92e2765111e4e17c5766fde42a6bd19784.

Change-Id: Icd3704f01dd74ac766b6e72bf126ac36ae2dd567
Merge "Revert "Entitlement APP overlay"" into lollipop