Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/InCallUI into cm-13.0

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