This reverts commit dccef33d. Reason for revert: Breaks ADB install disabled setting Change-Id: Icad438c592eb8e3be2a321e41fd75f9d577b002f (cherry picked from commit d7b6815d) Fixes: 73948872 Bug: 64472557