Merge "Remove libsurfaceflinger_unittest from root TEST_MAPPING" am: 82261324f2 am: f183eef4d3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1688946

Change-Id: I6c8cfc6978bf6f42e360d53be60a54f60042c6af