Merge "Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb am: d80a8e8fe7" into nyc-mr1-dev-plus-aosp