Revert "ANDROID: regression introduced override_creds=off"

This reverts commit 72c5343c.

Reason for revert: android-4.4 is for 'q' security updates, it is not dead.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 140816499
Change-Id: Ia99c0b420db306631e669428bb71eb8a2493ddc1