Merge "Merge "Remove @Nullable annotation for onConfigurationChanged." into tm-qpr-dev am: 05fafde8c8" into tm-qpr-dev-plus-aosp