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

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

Change-Id: Ib896a1f0b7d05ef49ff7126ea3b6a00fa25e5954