[automerger skipped] Merge "Remove libsurfaceflinger_unittest from root...

[automerger skipped] Merge "Remove libsurfaceflinger_unittest from root TEST_MAPPING" am: 82261324 am: f183eef4 am: 65512b66 -s ours am: f2eea529 -s ours am: a3a9e0c9 -s ours

am skip reason: Merged-In I99f9fdf5e75dae686f958e97e9685d1a00166877 with SHA-1 64ef146e is already in history

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

Change-Id: I212170a3dcc469e6f30b808c43d7637f732b80ee