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

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

Change-Id: I8848a0d7a1e256b3cb71188137ab51a8a1c829b3