Resolve Merge Disparity

The same merge conflict happened in the Widevine and Android repos, but
it was resolved differently. This patch brings the resolutions back in
sync.

Bug: 111504510
Bug: 111505796
Bug: 115358798
Test: Android Build
Change-Id: I5161ae3e1aad41ee034dc5fec59dad1c7699d65c

libwvdrmengine/test/unit/WVDrmFactory_test.cpp

@@ -4,12 +4,11 @@
  * License Agreement.
  */
 
+#include "android-base/properties.h"
 #include "cutils/properties.h"
 #include "gtest/gtest.h"
-#include "WVDrmFactory.h"
 #include "HidlTypes.h"
-
-#include "android-base/properties.h"
+#include "WVDrmFactory.h"
 
 namespace wvdrm {
 namespace hardware {