am b7412897: Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes...
am b7412897: Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev
* commit 'b7412897':
Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+