Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 71cb3377d3 am: dfb4863b03 am: 1c08cdefd7

Original change: https://android-review.googlesource.com/c/platform/external/MPAndroidChart/+/2276409

Change-Id: Ibe092ab696cbd5fd1133275fc76ad0ee7e090a88
Signed-off-by: Automerger Merge Worker <[email protected]>