Merge "Merge "Only add boolean extra to bundle when the value is false" into tm-dev am: 76f37a5d am: 06a00ac6" into tm-d1-dev-plus-aosp