Merge "Avoid redundant overwrite of value in TimeSparseArray" into udc-dev am: 7e39238a am: 3007d3c4

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



Change-Id: I6cb19b6c6126ae0105321d8e5f9d9d75ce6ad107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>