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

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

Change-Id: Id1edcadc7d18af906955f90159b5baec88cea7e4