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

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

Change-Id: I740dcdbd95d779126675f3f02db09fd6630add3f