[automerger skipped] [RESTRICT AUTOMERGE] SF: Call clear() instead of empty() am: f168dcdd73 -s ours am: fc4880f0e5 -s ours am: 08ff94f567 -s ours am: 844fca7f2c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I15fb19c46dcbafb62f9b464ec8177fb3d5553c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>