Merge "Add Nataniel as OWNER of WMShellFlickerTests/WMShellUnitTests" am: 2ba09b6747 am: c579af998c am: 47b3639a83 am: 7e454b9029

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

Change-Id: I0f50c5b9333f17d46bc77ae47164b762bd67098f