Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/InCallUI into HEAD

Android 6.0.1 release 3
tree: 1c0799e549e616c5cfac3b77cc1f4dd4621fcd9a
  1. res/
  2. src/
  3. tests/
  4. proguard.flags