Merge "Correct typo in the year of copyright" am: c0699fe9d8 am: 88f3835607 am: 5b05b704f1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978088

Change-Id: I2baa23c40d4783a08dcfba03c6e83db57a3629d0