Merge "Check for a null intent in RemoteVvmTaskManager#onStartCommand. am: c05ba58f5f am: 780df8423a" into qt-qpr1-dev-plus-aosp