Merge "Expose a static method for computing hash tree size" am: 633391cdb5 am: e60fc3f4f2

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1692746

Change-Id: I945ade6f10163b1448579e5e14292008d39505e8