Moving code to previous behavior

Undoing change to move to updated SystemApi version of
secret code.  This failed because the AndroidManifest
was not updated.  Rolling it back to previous state
for now.

Bug: 149604099
Test: make, flash
Test: Moving code to previous behavior
Change-Id: I8f3f9f4ef5c64dd9fa74bb9393446a9a1340f26e