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

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

Change-Id: Ia14f9c66644e0d605e9160b1676332f99f17a91b