Move the request for shell access to a later callback.

For bug 52196

Change-Id: I294ec10e1e404f145f657533bcbc2c3960b6e3e4
Merge "Move the request for shell access to a later callback."