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

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

Change-Id: Ife8fc97e476fd01a6c537ebb3346458dd11b629a