Merge "Support overriding display locale for SuggestedLocaleAdapter" into oc-dev
am: 2a05c5edb7

Change-Id: I4752951eee34ec5e98368a1b0a68ecb3cbf449cb