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: I7825a4ba05c6a7ab235f919c51017726de64da62