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

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

Change-Id: I4723fab329425a472b42a0ae8bb4179bdcf85a33