Merge "Add UserCompletedEventType#newUserCompletedEventType static  method for testing." into tm-dev am: 45af320e am: 1d370182

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

Change-Id: I07888a909b5a62df9a97e6034fc2744e9f4cf0a7