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

* commit '67e2aab109366fbb146d499f26c1d76c5c45bc52':
  Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+