Merge "Workaround a robelectric related NPE in SurfaceSyncGroup.addTimer" into udc-dev am: a380a318d3 am: 3e41d5eb98

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

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