Merge "[RFCLAT#16] remove drop_root_and_caps" am: 95cbf3217f am: 35e51c45a4 am: 4feadad882

Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1949737

Change-Id: I0d63ca68948f1ca9b004009f1e6fe0990a5f07f6