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

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

Change-Id: I1592775559284ab6fe70010983c8f77bebddd118