Merge commit '822d8f67ebcdab61fa513d6d9401476e12143386' * commit '822d8f67ebcdab61fa513d6d9401476e12143386': Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
Merge commit '822d8f67ebcdab61fa513d6d9401476e12143386' * commit '822d8f67ebcdab61fa513d6d9401476e12143386': Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43