Merge "Make wm to own protolog JSON file" am: 9500cbd939 am: 38909ac8e9

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

Change-Id: I7c1cd2edfa6a608a03d12de54e169feaa9f61db3