2756293910
Mirror of support lib patch https://android-review.googlesource.com/#/c/60032/ into frameworks/base. Change-Id: I8d1cb2e217721336674b8e3e2ef8722a8d9baefd