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

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

Change-Id: Iace5b3a8afadb14673ab823d66ecc31fb38f9090