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