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

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

Change-Id: Ic0df683b6a212aa1468b7bd28db0e42a04b6f714