Merge "Use ISO 8601 format for LocalLog local timestamps" am: 172fd44b2f am: 22ed1a7a79

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

Change-Id: I918da367c15a2ba74fac065482f271f536ef982e