[automerger skipped] stopwatch: improve stopwatch problems am: 144a2679 -s...

[automerger skipped] stopwatch: improve stopwatch problems am: 144a2679 -s ours am: 917a540a -s ours

am skip reason: Merged-In Ie59dbc0bd2f574761eed7aac695cbff07948d8e2 with SHA-1 627a6def is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15009472

Change-Id: I1059e9e515b2b027827c3dd3e1d8e264396e9f7a