Fix AOSP T9 checkbox, and fiddle with startActivityForResult

Change-Id: Ic32eab6417005fbe72ab8ef6d7e5cd371a73153f