ANDROID: fix wrong merge resolution

The previous merge resolution broke the locking policy.

Bug: 360865292
Bug: 359741679
Fixes: 2447b4c0 ("Merge tag 'android14-5.15.153_r00' into 'android14-5.15'")
Change-Id: I3820631796b186978164ef4a4ff9150f2491b8f3
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
(cherry picked from commit c8c7a448)