Fix a NPE when putting a null-Bundle in an Intent

Happens frequently e.g. with GoogleAccountAuthenticator

Change-Id: I284bf153f40ee9cc3e70bce6efcc3b9e6706361b
Merge "Fix a NPE when putting a null-Bundle in an Intent" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0