Merge "Remove battery event time detection from StylusUpdater." into udc-dev