Merge "Reset LogManager after each test method in LogManagerTest" am: d6b6238c8b am: f22f55ebaf am: 0acb7b2601

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2432713

Change-Id: I5770de29e65f68e20b09f712b2c398c008832eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>