Track nio API change.

Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
Merge "Track nio API change."
Merge https://android.googlesource.com/platform/frameworks/base into jb-devel